From be7c3e95bc3b32ff491a2929b5a2df22393c0c4a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 20 Aug 2009 08:23:33 +0100 Subject: [PATCH] pygrub: Revert 19322:3118041f2259, as it breaks timeout=0 behaviour Signed-off-by: Keir Fraser --- tools/pygrub/src/pygrub | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index ac20aace67..93e157c4b7 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -443,11 +443,7 @@ class Grub: # Timed out waiting for a keypress if mytime != -1: mytime += 1 - # curses.timeout() does not work properly on Solaris - # So we may come here even after a key has been pressed. - # Check both timeout and mytime to avoid exiting - # when we shouldn't. - if timeout != -1 and mytime >= int(timeout): + if mytime >= int(timeout): self.isdone = True break else: -- 2.30.2